95. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-14 00:01:34 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

95.1 Files compared

#LocationFileLast Modified
1Porto v3.2.3/Magento 2.x/Porto Theme/app/code/Mageplaza/LayeredNavigation/view/frontend/templates/layerview.phtml2018-10-10 20:33:22 +0000
2Porto v3.2.4/Magento 2.x/Porto Theme/app/code/Mageplaza/LayeredNavigation/view/frontend/templates/layerview.phtml2020-06-26 11:11:14 +0000

95.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged15106
Changed1178
Inserted11
Removed22

95.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

95.4 Active regular expressions

No regular expressions were active.

95.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Mageplaza 3  * Mageplaza
4  * 4  *
5  * NOTICE OF LICENSE 5  * NOTICE OF LICENSE
6  * 6  *
7  * This source file is subject to the Mageplaza.com license that is 7  * This source file is subject to the Mageplaza.com license that is
8  * available through the world-wide-web at this URL: 8  * available through the world-wide-web at this URL:
9  * https://www.mageplaza.com/LICENSE.txt 9  * https://www.mageplaza.com/LICENSE.txt
10  * 10  *
11  * DISCLAIMER 11  * DISCLAIMER
12  * 12  *
13  * Do not edit or add to this file if you wish to upgrade this extension to newer 13  * Do not edit or add to this file if you wish to upgrade this extension to newer
14  * version in the future. 14  * version in the future.
15  * 15  *
16  * @category    Mageplaza 16  * @category    Mageplaza
17  * @package     Mageplaza_LayeredNavigation 17  * @package     Mageplaza_LayeredNavigation
18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/) 18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
19  * @license     https://www.mageplaza.com/LICENSE.txt 19  * @license     https://www.mageplaza.com/LICENSE.txt
20  */ 20  */
21 ?> 21 
22 <?php if ($block->canShowBlock())
: ?>		 22 
if ($block->canShowBlock()) : ?>
23     <?php 23     <?php
24     $filters     = $block->getFilters(); 24     $filters     = $block->getFilters();
25     $layerConfig = $this->helper('Mageplaza\LayeredNavigation\Helper\Data')->getLayerConfiguration($filters); 25     $helperData  = $this->helper(\Mageplaza\LayeredNavigation\Helper\Data::class);
    26     $layerConfig = $helperData->getLayerConfiguration($filters);
26     $filtered    = count($block->getLayer()->getState()->getFilters()); 27     $filtered    = count($block->getLayer()->getState()->getFilters());
    28     $helperImage = $this->helper(\Mageplaza\LayeredNavigation\Helper\Image::class);
27     ?> 29     ?>
28     <div class="block filter" id="layered-filter-block" 30     <div class="block filter" id="layered-filter-block"
29          data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'> 31          data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'>
30     
31         <div id="ln_overlay" class="ln_overlay"> 32         <div id="ln_overlay" class="ln_overlay">
32             <div class="loader"> 33             <div class="loader">
33                 <img src="<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>" alt="Loading..."> 34                 <img src="<?= /** @noEscape */ $block->getViewFileUrl('images/loader-1.gif')
 ?>" alt="Loading...">
34             </div> 35             </div>
35         </div> 36         </div>
36  37         <div class="block-title filter-title" data-count="<?= /** @noEscape */ $filtered ?>">
37         <div class="block-title filter-title" data-count="<?php /*
 @escapeNotVerified */
 38             <strong data-role="title"><?= /** @noEscape */ __('Shop By') ?></strong>
38         echo $filtered; ?>">    
39             <strong data-role="title"><?php /*
 @escapeNotVerified */
    
40                 echo __('Shop By') ?></strong>    
41         </div> 39         </div>
42         <div class="block-content filter-content" data-mage-init='{"mpLayer": <?php echo $layerConfig ?>}'> 40         <div class="block-content filter-content" data-mage-init='{"mpLayer": <?= /** @noEscape */ $layerConfig ?>}'>
43             <?php echo $block->getChildHtml('state') ?> 41             <?= /** @noEscape */ $block->getChildHtml('state') ?>
44  42             <?php if ($block->getLayer()->getState()->getFilters()) : ?>
45             <?php if ($block->getLayer()->getState()->getFilters())
: ?>		    
46                 <div class="block-actions filter-actions"> 43                 <div class="block-actions filter-actions">
47                     <a href="<?php /* @escapeNotVerified */ 44                     <a href="<?= /** @noEscape */ $block->getClearUrl() ?>" class="action clear filter-clear">
48                     echo $block->getClearUrl() ?>" 45                         <span><?= /** @noEscape */ __('Clear All') ?></span>
49                        class="action clear filter-clear"><span><?php /* @escapeNotVerified */ 46                     </a>
50                             echo __('Clear All') ?></span></a>    
51                 </div> 47                 </div>
52             <?php endif; ?> 48             <?php endif; ?>
53     
54             <?php $wrapOptions = false; ?> 49             <?php $wrapOptions = false; ?>
55             <?php foreach ($filters
 50             <?php foreach ($filters as $key => $filter) : ?>
56  51                 <?php if ($filter->getItemsCount()) : ?>
57                            as $key => $filter): ?> 52                     <?php if (!$wrapOptions) : ?>
58         <?php if ($filter->getItemsCount())
: ?>		 53                         <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle">
59         <?php if (!$wrapOptions)
: ?>		 54                             <?= /** @noEscape */ __('Shopping Options') ?>
60             <strong role="heading" aria-level="2"
 55                         </strong>
61                     class="block-subtitle filter-subtitle"><?php echo __('Shopping Options') ?></strong>    
62             <div class="filter-options" id="narrow-by-list" data-role="content"> 56                         <div class="filter-options" id="narrow-by-list" data-role="content">
63                 <?php $wrapOptions = true; 57                         <?php $wrapOptions = true;
64                 endif; ?> 58                     endif; ?>
65                 <div data-role="ln_collapsible" class="filter-options-item" 59                     <div data-role="ln_collapsible" class="filter-options-item"
66                      attribute="<?php echo $filter->getRequestVar() ?>"> 60                          attribute="<?= /** @noEscape */ $filter->getRequestVar() ?>">
67                     <div data-role="ln_title" class="filter-options-title"><?php /* @escapeNotVerified */ 61                         <div data-role="ln_title" class="filter-options-title">
68                         echo __($filter->getName()) ?></div> 62                             <?= /** @noEscape */ __($filter->getName()) ?>
69                     <div data-role="ln_content" class="filter-options-content"><?php /* @escapeNotVerified */ 63                             <?php if ($filter->hasAttributeModel()
70                         echo $block->getChildBlock('renderer')->setFilter($filter)->render($filter); ?></div> 64                                 && $filter->getAttributeModel()->getData('show_tooltip') === '1') : ?>
    65                                 <?php
    66                                     $imageUrl = $helperImage->getTooltipThumbnail($filter);
    67                                     $tooltipContent = $helperData->getTooltipContent($filter);
    68                                 ?>
    69                                 <span class="ln_tooltip"  data-toggle="tooltip" title="<?= $block->escapeHtml($tooltipContent) ?>">
    70                                     <?php if ($imageUrl) : ?>
    71                                     <image src="<?= $block->escapeUrl($imageUrl) ?>" width="22" height="22"
    72                                            class="ln_tooltip_thumbnail"
    73                                            alt="<?= $block->escapeHtml($tooltipContent) ?>">
    74                                     <?php endif; ?>
    75                                 </span>
    76                             <?php endif; ?>
    77                         </div>
    78                         <div data-role="ln_content" class="filter-options-content">
    79                             <?= /** @noEscape */ $block->getChildBlock('renderer')->setFilter($filter)->render($filter); ?>
    80                         </div>
71                 </div> 81                     </div>
72                 <?php endif; ?> 82                 <?php endif; ?>
73                 <?php endforeach; ?> 83             <?php endforeach; ?>
74                 <?php if ($wrapOptions)
: ?>		 84             <?php if ($wrapOptions) : ?>
75             </div> 85                 </div>
76         <?php else
: ?>		 86             <?php else : ?>
77             <script> 87                 <script type="text/javascript">
78                 require([ 88                     require([
79                     'jquery' 89                         'jquery'
80                 ], function ($) { 90                     ], function ($) {
81                     $('#layered-filter-block').addClass('filter-no-options'); 91                         $('#layered-filter-block').addClass('filter-no-options');
82                 }); 92                     });
83             </script> 93                 </script>
84             <?php endif; ?> 94             <?php endif; ?>
85  95             <?= /** @noEscape */ $block->getChildHtml('layer_additional_info') ?>
86             <?php echo $block->getChildHtml('layer_additional_info') ?>    
87         </div> 96         </div>
88     </div> 97     </div>
89 <?php endif; ?> 98 <?php endif; ?>

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.